marketplace
Merge branch 'master' of github.com:Educ8-2014/educ8-angular

Conflicts:
	app/.DS_Store
added user schedule pages
Merge branch 'master' of github.com:Educ8-2014/educ8-angular
changed directories
Merge branch 'master' of github.com:Educ8-2014/educ8-angular
fixed marketplace css bugs