merge
Merge branch 'master' of github.com:xrogix/projeto

Conflicts:
	protected/runtime/application.log