added scrollbar and spinner
added login temporary
Added network
change login  to hashmap
updated login
fix bugs in login
dynamic menu
Merge branch 'testing' into testing2

Conflicts:
	EatUBC/res/layout/activity_main.xml
	EatUBC/src/com/jminions/eatubc/MainActivity.java
fixed bugs from merging
tried fixing bugs
combined but not really working