Merge branch 'refactor-outsource-matthes' of https://github.com/matthesrieke/enviroCar-app into develop
Merge branch 'refactor-outsource-matthes' of https://github.com/matthesrieke/enviroCar-app into develop
Merge branch 'refactor-outsource-matthes' of https://github.com/matthesrieke/enviroCar-app into develop
fixed #59
update datastructure and use now only one database
Merge branch 'refactor-outsource-matthes' of
https://github.com/matthesrieke/enviroCar-app into develop

Conflicts:
	org.envirocar.app/src/org/envirocar/app/application/CommandListener.java
	org.envirocar.app/src/org/envirocar/app/application/ECApplication.java
refactor datastructures
refactor datastructures
refactor datastructures
Merge branch 'refactor-outsource-matthes' of
https://github.com/matthesrieke/enviroCar-app into develop

Conflicts:
	org.envirocar.app/src/org/envirocar/app/activity/MainActivity.java
refactor datastructures
Merge branch 'refactor-outsource-matthes' of https://github.com/matthesrieke/enviroCar-app into develop
refactoring
refactor datastructures
Merge pull request #6 from janschulte/develop

Develop