commit
development.log
development.log
rm development.log from repo
add spec test for Faculty model
Merge remote-tracking branch 'origin/master'

Conflicts:
	log/development.log
test courses seed
resolved conflict
conflict solving
fixed my bug with equal-height-block.js
changed templ
fixed disappearing faculties bug on main page
Merge branch 'master' of https://github.com/SoftServeUniversity/WEBUI-092
asynchronous loading of views in spec file
now async loading of view in spec works for real
add jasmine test for DepartmentCollection
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/collections/courses/CoursesCollection.js
changed collection loadin in admin area to callbacks
collection loadin
fixed conflicts