.
.
Merge remote-tracking branch 'origin/master'

Conflicts:
	2013-08-23.web-studentlist-db/pom.xml
Merge branch 'master' of https://github.com/yqoq/JS2013
Merge branch 'master' of https://github.com/yqoq/JS2013
add dep