tst
Merge branch 'McDowell---Main2' of https://github.com/UTASoftwareEngineering2014/HealthNow into McDowell---Main2

Conflicts:
	AndroidManifest.xml
	src/com/application/healthnow/LoginActivity.java
	src/com/application/healthnow/MainActivity.java

	src/com/application/healthnow/database/adapter/LoginDataBaseAdapter.java