#240 added security checks, and improved test coverage
#307 added github comments
Merge remote branch 'origin/develop' into develop-ja

Conflicts:
	app/controllers/users_controller.rb
Merge pull request #307 from tkowark/develop-ja

#240 added security checks, and improved test coverage