...
Merge branch 'master' of https://github.com/revcommunity/revcommunity

Conflicts:
	src/main/java/org/revcommunity/controller/CategoryController.java
	src/main/java/org/revcommunity/nokaut/NokautConnector.java
	src/main/webapp/app/app.js
	src/main/webapp/app/model/Review.js
	src/main/webapp/app/routers.js
	src/test/java/org/revcommunity/test/APITest.java