fixing indentaions and convintions
Merge branch 'database_migrations' into dev_database

Conflicts:
	tutor/db/migrate/20140513171629_create_notifications.rb