Merge pull request #38 from Connexions/hotfixes

Hotfixes
integration of majors/non-majors biology template
updated m-bio for testing
integrated classes majors/non-majors
changed file names to conform to class names majors/non-majors
updated to latest evoultion nonmajors svg header - fonts differed
updated biology test module
Merge branch 'biology-integration' into dev

Conflicts:
	css/ccap-biology.less