Merge 447
Merge branch 'master' of github.com:MediaSapiens/fevent

* 'master' of github.com:MediaSapiens/fevent: (49 commits)
  minimal permissions
  Permissions decorators
  Permissions and test
  check_view_permissions
  Moved test setup/teardown aclls to the generic definition
  Updated permissions registry sample with the decorated function test
  Updated permissions registry sample with the decorated function test
  Testing method registry
  profile view UI small updates
  Hiding user id for an own profile request
  Sign in process
  Added multidecorator test
  Added multidecorator test
  Permission API
  Change choice_column functionality
  test_roles_and_permissions fixed
  Fixed tests functionality
  RuntimeError: working outside of request context
  Understanding
  14.05.12 last changes
  ...

Conflicts:
	flamaster/account/models.py
	flamaster/app.py
	flamaster/core/utils.py
Minimal users_list and test
Merge branch 'master' of github.com:MediaSapiens/fevent into 464_administrator_tools

* 'master' of github.com:MediaSapiens/fevent:
  Integrated slug mixin into the project structure
  Add test for the tree finctionality model of categories
  Add TreeNode mixin
  Categories first realize
  Additional fixes and refactoring on crud generic
  Updated requirements. Refactored model CRUD mixin
  Added decorator to check if logged in user is superuser

Conflicts:
	flamaster/events/__init__.py
Coffee compiling bug fixed
User list: minimal view and test
Merge branch 'master' of github.com:MediaSapiens/fevent into 464_administrator_tools

* 'master' of github.com:MediaSapiens/fevent:
  Updated assets. Changed compile script
  Updated compiled assets
  Activation processing
  Added compiled js to the repository
  Purged garbage from the test sessions. fixed account api test
  Switched to the postgresql for local use and sqlite inmemory for tests
  Change method_decorators to decorators in Product
  Check all tests
  Check some models with rename title-name
  Fixes on front and activation
  Purged stalled front
  Add test for category model
  Separated event and category model test
  Check bug with self-referential relation
  Moved category model and resource to the product blueprint

Conflicts:
	flamaster/account/models.py
	flamaster/app.py
	flamaster/event/api.py
	tests/test_models/test_event_model.py
test_log deleted
ProfileResource with decorator is NoneType
Resource implemented
_
Merge and start to develop frontend for admin tools
js assets
Merge branch 'master' of github.com:MediaSapiens/fevent into 464_administrator_tools

* 'master' of github.com:MediaSapiens/fevent:
  Added profile view rendering. Changed to backbone way
latest
Merge branch 'master' of github.com:MediaSapiens/fevent into 464_administrator_tools

* 'master' of github.com:MediaSapiens/fevent:
  Refactored backbone view rendering approach
Admin view moved to profile.py
Merge branch 'master' of github.com:MediaSapiens/fevent into 464_administrator_tools

* 'master' of github.com:MediaSapiens/fevent:
  Made empty template render for a user list view
  Purged assets config for nonexistent files
  Moved admin layout to the profile module. Fixed admin view template path
  Options push for administrator's view
  latest
  js assets
  _
  Resource implemented
  ProfileResource with decorator is NoneType
  test_log deleted
  User list: minimal view and test
  Minimal users_list and test
  Merge 447

Conflicts:
	flamaster/account/__init__.py
	flamaster/account/templates/_user_list.html
	flamaster/account/views/profile.py
Merge branch 'master' into 464_administrator_tools
Fixed profile view naming