Some changes
Merge branch 'master' of https://github.com/aremnev/update-notifier

Conflicts:
	update-notifier-backend/src/main/java/net/thumbtack/updateNotifierBackend/resourceHandlers/UsersHandler.java
	update-notifier-frontend/app/helpers/database_helper.rb