neshto
Merge branch 'master' of http://github.com/Ico91/Articles

Conflicts:
	src/articles/web/resources/users/UsersResource.java
user statistics