associate user with applications
Fix conflict.
Merge pull request #2 from SocioQuiz/master

Merge pull request #12 from not001praween001/master
Merge branch 'master' of https://github.com/not001praween001/socio_quiz

Conflicts:
	Gemfile.lock
fix conflicts
fix db/schema.rb
Merge branch 'yo-add-authfilter-to-applications' of https://github.com/yuchan/socio_quiz into yuchan-yo-add-authfilter-to-applications

Conflicts:
	app/models/user.rb
	db/schema.rb
Merge branch 'yuchan-yo-add-authfilter-to-applications'
Merge pull request #32 from not001praween001/master

Merge pull request #12 from not001praween001/master