Awesome awesomeness of awesome
initial user management page
merges
changes user profile
user profile
adding even more awesome stuff. It is really awesome
wow so awesome.
Merge branch 'RolanARES_Branch_of_awesome' of https://github.com/whoshuu/chimerider into RolanARES_Branch_of_awesome

Conflicts:
	res/values/strings.xml
changes
Merge branch 'RolanARES_Branch_of_awesome' of https://github.com/whoshuu/chimerider into RolanARES_Branch_of_awesome
contacts new, edit, etc