Touched up MainActivity XML Layout
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	gen/cs/ualberta/ca/tunein/R.java
Added Network folder from PicPoster to be modified to implement ElasticSearch
Merge remote-tracking branch 'upstream/master' added Network folder with ES content