Merge branch 'master' of C:\Users\STYLIANOS\Documents\IdeaProjects\autobahn-android with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/autobahn/android/trackCircuit.java
Merge remote-tracking branch 'origin/master'
Updated file names
AsyncTask on TrackCircuitActivity added
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/autobahn/android/AutobahnClient.java
	src/autobahn/android/mainMenu.java
	src/autobahn/android/trackCircuitActivity.java
Update
Update