manual dependency injection for unit testing
Merge branch 'newVersion' of https://github.com/inovex/zax into newVersion

Conflicts:
	src/com/inovex/zabbixmobile/activities/MainActivity.java
	src/com/inovex/zabbixmobile/data/ZabbixDataService.java