fix avatar problems
Merge branch 'avatar' into develop
fix pagination problem
Merge branch 'develop' of bitbucket.org:prograils/enlightenmentapp into develop
imrove login page look, remove comments
fix set avatar
avatar resize to fill
Merge branch 'avatar' into develop

Conflicts:
	app/assets/javascripts/routes/content_entities.js.coffee
fix current user in api
Merge branch 'bugs' into develop
correct json for build content entities for each group in frontend
Merge branch 'develop' of bitbucket.org:prograils/enlightenmentapp into develop
useless before model hook
ability, test, refractor
encode credentials refractor @test_helper
tags progress
api tests
small refractor
clean code a little
destroy group behaviour, remove redundant columns