Added support to view artists in main activity, fixed numerous bugs with isConnected flag where app crashes on several occations if not connected
Merge branch 'master' of https://github.com/cszarapka/eece_381

Conflicts:
	Module2/Android/.metadata/.log
	Module2/Android/.metadata/.plugins/org.eclipse.cdt.core/.log
	Module2/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MyFirstApp/.indexes/a0/d6/history.index
	Module2/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MyFirstApp/.indexes/a0/d6/properties.index
	Module2/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MyFirstApp/.indexes/a0/de/history.index
	Module2/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MyFirstApp/.indexes/e4/81/96/e3/history.index
	Module2/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MyFirstApp/.indexes/history.index
	Module2/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MyFirstApp/.indexes/properties.index
	Module2/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MyFirstApp/.markers
	Module2/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MyFirstApp/.markers.snap
	Module2/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MyFirstApp/.syncinfo.snap
	Module2/Android/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	Module2/Android/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	Module2/Android/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Module2/Android/.metadata/.plugins/org.eclipse.core.resources/.snap
	Module2/Android/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	Module2/Android/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.ddms.prefs
	Module2/Android/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	Module2/Android/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	Module2/Android/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	Module2/Android/.metadata/.plugins/org.eclipse.jdt.core/3441175534.index
	Module2/Android/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	Module2/Android/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	Module2/Android/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	Module2/Android/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	Module2/Android/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	Module2/Android/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	Module2/Android/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	Module2/Android/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/MyFirstApp/2013/11/47/refactorings.history
	Module2/Android/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/MyFirstApp/2013/11/47/refactorings.index
	Module2/Android/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	Module2/Android/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	Module2/Android/MyFirstApp/bin/MyFirstApp.apk
	Module2/Android/MyFirstApp/bin/classes.dex
	Module2/Android/MyFirstApp/bin/classes/com/example/myfirstapp/ConnectActivity$SocketConnect.class
	Module2/Android/MyFirstApp/bin/classes/com/example/myfirstapp/ConnectActivity$TCPReadTimerTask.class
	Module2/Android/MyFirstApp/bin/classes/com/example/myfirstapp/ConnectActivity.class
	Module2/Android/MyFirstApp/bin/classes/com/example/myfirstapp/MainActivity$1.class
	Module2/Android/MyFirstApp/bin/classes/com/example/myfirstapp/MainActivity.class
	Module2/Android/MyFirstApp/bin/classes/com/example/myfirstapp/R$drawable.class
	Module2/Android/MyFirstApp/bin/classes/com/example/myfirstapp/R$id.class
	Module2/Android/MyFirstApp/bin/classes/com/example/myfirstapp/R$layout.class
	Module2/Android/MyFirstApp/bin/classes/com/example/myfirstapp/R$menu.class
	Module2/Android/MyFirstApp/bin/classes/com/example/myfirstapp/R$string.class
	Module2/Android/MyFirstApp/bin/classes/com/example/myfirstapp/R$style.class
	Module2/Android/MyFirstApp/bin/classes/com/example/myfirstapp/R.class
	Module2/Android/MyFirstApp/bin/resources.ap_
	Module2/Android/MyFirstApp/gen/com/example/myfirstapp/R.java
	Module2/Android/MyFirstApp/res/values/strings.xml
cleaning up Android folder
Merge branch 'master' of https://github.com/cszarapka/eece_381