Merge branch 'develop' of cvs2:web/CityofMI into develop

Conflicts:
	Toolkit/Events/views/eventSearchForm.html

diff --cc Toolkit/Events/views/eventSearchForm.html
index 3d7d2d8,8bd3242..466c47d
--- 1/Toolkit/Events/views/eventSearchForm.html
--- 2/Toolkit/Events/views/eventSearchForm.html
+++ b/Toolkit/Events/views/eventSearchForm.html
@@@ -15,8 -15,8 +15,7 @@@
              <div id="submitNameWrapper">
                  <input
                      type="image"
-                     src="{mediaBaseURL:h}assets/go.png"
 -                    src="<?php echo MEDIA_BASE_URL;?>assets/go.png"
--                    alt="Search Events">
++                    src="<?php echo MEDIA_BASE_URL;?>assets/go.png">
              </div>
          </form>
      </div>
@@@ -77,8 -77,8 +76,7 @@@
          <div id="submitWrapper">
            <input
              type="image"
-             src="{mediaBaseURL:h}assets/go.png"
 -            src="<?php echo MEDIA_BASE_URL;?>assets/go.png"
--            alt="Search Events">
++            src="<?php echo MEDIA_BASE_URL;?>assets/go.png">
          </div>
      </form>
  </div>