Fixed couple issues with build code
pushed updated stage files
Merge branch 'master' of github.com:TeamMentor/TM_4_0_Design

Conflicts:
	static/css/custom-style.css