project cleanup

Signed-off-by: Garet Claborn <garet@approachfoundation.org>
project cleanup

Signed-off-by: Garet Claborn <garet@approachfoundation.org>
Merge branch 'master' of https://github.com/stealthpaladin/Approach

Conflicts:
	project/support/templates/static/head_base.htm
	project/support/templates/static/home_slider.htm
	project/support/templates/static/navigation_bar.htm
	project/support/templates/static/service_nav.htm
	project/support/templates/static/service_signin.htm