Added upload image from view a stream
Merge branch 'viewastream' of https://github.com/sadsyed/ConnexusSSAR into viewastream
Fixed merge conflict, only whitespace problem.
Conflicts:
	app/src/main/java/ssar/apt/connexusssar/ViewAStreamActivity.java
added code for more pictures
Enabled view all streams button
Fixed streamname in title of page.
started adding nearby streams ui
Added nearby imagebutton
Started nearby streams request
Not working nearby streams...not rendering images.
Fixed nearby streams bug
nearby streams working
Added login screen
Added file upload page
Merge branch 'viewastream' of https://github.com/sadsyed/ConnexusSSAR
Merged in view a stream branch.
Conflicts:
	app/src/main/java/ssar/apt/connexusssar/util/ConnexusSSARConstants.java
	app/src/main/java/ssar/apt/connexusssar/util/StreamParser.java
	app/src/main/res/values/strings.xml