Add UserActivityDaoTest + import sql
Merge branch 'master' of https://github.com/artivisi/training-web-basic-2014-02

Conflicts:
	sample-code/belajar-springmvc/src/main/resources/import.sql