UserSettings
Přidán mail me@martinsifra.cz pro logování
UserSettings pokračování
Checkpoint
Merge origin/master into user-settings

Conflicts:
	app/module/AdminModule/templates/UserSettings/settings.latte
Merge origin/master into user-settings

Conflicts:
	app/module/AdminModule/templates/UserSettings/settings.latte
UserSettings
Merge branch 'user-settings'