BaseActivity6 encoded
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/eu/factorx/awac/service/impl/ReportServiceImpl.java
BaseActivity6 encoded