Merge branch 'master' into HEAD
Linking Faculty to Addresses & Contacts
[controller] Notes
Added Guardians controller
Added Schedules controller
Merge branch 'master' of https://github.com/kalkov/GAKUEngine

Conflicts:
	db/schema.rb
Adding Exams controller
Adding Notes controller spec and index view
Adding Notes controller spec and index view
Merge pull request #2 from momchilov/master

momchilov merge
Clean controllers
Clean models
Clean spec/models
[spec/controllers] Clean notes controller
Merge pull request #24 from kalkov/master

mostly models, controllers and specs for them
[Profile] Change first_name and last_name to name and surname
Merge branch 'master' of https://github.com/snowsunny/GAKUEngine

Conflicts:
	config/routes.rb
Merge pull request #25 from kalkov/master

[Profile] changed schema, a lot of edited and new views
Change link b/w Student and ClassGroup to join model ClassGroupEnrollments
[migration] Delete create_class_groups_students