Faltando mais ";"
Merge branch 'master' of https://github.com/jonimane/usvn.git

Conflicts:
	app/layouts/default.phtml
	app/views/scripts/index/index.phtml
	app/views/scripts/project/commit.phtml
	app/views/scripts/useradmin/index.phtml