cleaned userweb from templates and photos
Merge branch 'master' of https://github.com/madgeeklabs/meveo
soy un hacker
Merge branch 'master' of https://github.com/madgeeklabs/meveo

Conflicts:
	templates/user-interface.html
Merge branch 'master' into videoInUserInteraction

Conflicts:
	templates/css/user-style.css