minor change to AlterTest
lots of additions as needed to support porting silicon forward and updating it to work with the most recent backing pages
Merge branch 'master' of https://github.com/healthgrades/optimus

Conflicts:
	public/img/bottom_tip-tensnacks.png
	public/img/header_ad_holder.png
	public/img/icon_calendar_white.png
	public/img/icon_cross_white.png
	public/img/icon_location_white.png
	public/img/icon_phone_white.png
	public/img/icon_search_white.png
	public/img/silicon_bottom_tips1-2.jpg
	public/img/silicon_bottom_tips2-2.jpg
	public/less/silicon.css
add images that didnt make it in the last merge