register and login #1 #2
Merge branch 'develop' of https://github.com/liyijie/room_monitor into develop

Conflicts:
	db/migrate/20140516015541_devise_create_users.rb
	db/schema.rb