Change DB add admin and normal user in seed and application.yml.example
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/seeds.rb
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
[#53340471] add static page wait file from requirement