token controller implementation
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/src/main/java/com/devicehive/dao/OAuthClientDAO.java
	server/src/main/java/com/devicehive/dao/OAuthGrantDAO.java