working on user profile
Merge pull request #48 from Konviser/master

Change the form to display error messages containing slovenian weird letters (ščž etc)
user profile added avatar
Merge branch 'master' of https://github.com/CodeCatz/actifaction
Merge pull request #49 from naisnouk/master

user profile added avatar
login required for viewing actions
Merge remote-tracking branch 'upstream/master'
Merge pull request #50 from ialja/master

login required for viewing actions
sumnik dodan na edit form
Merge pull request #51 from ialja/master

sumnik dodan
bugfix for user avatar upload
user profile editing added
aadded uer porfile edit functionality

Conflicts:
	actifaction/api/models.py
	actifaction/web/forms/user_forms.py
	actifaction/web/templates/pages/user_page.html
adding encoding to forms
some refactoring of user templates made
Merge pull request #52 from ercchy/master

Working on user profile
adding request into context loader processor
Merge pull request #53 from ercchy/master

adding request into context loader processor
adding another request context processor to display media
Merge pull request #54 from ercchy/master

adding request into context loader processor