working on notifications
working on notifications api
Merge branch 'master' into notification_center

Conflicts:
	app/models/user.rb
	db/schema.rb
Merge branch 'master'
add sqlite3 to Gemfile
fix bug