Updated UIs of all screens except transact
Merge branch 'master' of https://github.com/lambertjamesd/SmartTransact

Conflicts:
	AndroidApp/gen/com/example/helloworld/R.java