Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'

Conflicts:
	Gemfile.lock
Add scope for authentication
Merge branch 'dev'
Date quick fix
Merge branch 'master' into dev
Same line...