And 5 new files

1.add a new activity named as activity_test, which is useful for
testing the functions about the operations of database
2.implement that get all data from tables of exercise time and exercise
location
Merge branch 'master' of https://github.com/chickenbellyfinn/SmartCoach

Conflicts:
	SmartCoachDB/AndroidManifest.xml
	SmartCoachDB/gen/edu/wpi/smartcoachdb/R.java
	SmartCoachDB/src/edu/wpi/smartcoachdb/dao/ExerciseLocationDao.java
	SmartCoachDB/src/edu/wpi/smartcoachdb/dao/ExerciseTimeDao.java

SmartCoachDB/src/edu/wpi/smartcoachdb/dao/impl/ExerciseLocationDaoImpl.j
ava
	SmartCoachDB/src/edu/wpi/smartcoachdb/dao/impl/ExerciseTimeDaoImpl.java
error