add
add
add
Merge branch 'master' of https://github.com/ludwiksh/Marksimos

Conflicts:
	public/app/js/translation.js
fixed logout function
Merge branch 'master' of https://github.com/ludwiksh/Marksimos