connection
commit
test
Simulation
download from server
Merge remote-tracking branch 'origin/master'

Conflicts:
	TEModel/AndroidManifest.xml
	TEModel/bin/AndroidManifest.xml
	TEModel/bin/R.txt
	TEModel/bin/classes/com/groupE/temodel/R$string.class
	TEModel/bin/classes/com/groupE/temodel/R$style.class
	TEModel/bin/classes/com/groupE/temodel/R$styleable.class
	TEModel/bin/classes/com/groupE/temodel/SimulationsActivity.class
	TEModel/gen/com/groupE/temodel/R.java
	TEModel/res/values/strings.xml
	TEModel/src/com/groupE/temodel/ModelActivity.java
	TEModel/src/com/groupE/temodel/SimulationAdapter.java
	TEModel/src/com/groupE/temodel/SimulationsActivity.java