Sutff
Merge branch 'Reza2'

Conflicts:
	.gitignore
	AndroidManifest.xml
added listinfo class, wired menu from map to create list activity
tons of shit
changed name of display jont
shit though
changing resources
Cropping and dropping hot shit
fixing crop
cleaning up code in register
cleaning up errors
premerge
uhhhh
shit