lala
Merge branch 'master' of
https://github.com/anberger/AAD1_pro_emulator.git

Conflicts:
	AAD1_pro_emulator/src/com/aad1/aad1_pro_emulator/MainActivity.java
Merge branch 'master' of
https://github.com/anberger/AAD1_pro_emulator.git

Conflicts:
	AAD1_pro_emulator/src/com/aad1/aad1_pro_emulator/MainActivity.java