Merge branch 'master' of github.com:/SagePoint/sagepoint-public

Conflicts:
	app/styles/home-hero.scss
	app/views/main.html

git-svn-id: file:///var/svn/sagepoint-public/trunk@9 c19a6890-ad51-4bac-a907-c977e3f8e779
Merge branch 'master' of github.com:/SagePoint/sagepoint-public

Conflicts:
	app/styles/home-hero.scss

git-svn-id: file:///var/svn/sagepoint-public/trunk@10 c19a6890-ad51-4bac-a907-c977e3f8e779
Merge branch 'develop' of github.com:/SagePoint/sagepoint-public