sip
Merge branch 'master' of github.com:diogenes-moreira/issue-tracker

Conflicts:
	issue-tracker/src/main/webapp/config.properties