modified:   app/controllers/qrcodes_controller.rb
	modified:   app/models/qrcode.rb
	modified:   app/views/qrcodes/login_page.html.erb
	new file:   db/migrate/20140315135009_change_primary_key_of_qrcodes_to_rand_string.rb
	modified:   db/schema.rb
Merge branch 'master' of https://github.com/xumc/scan_code_login