adfs
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/webapp/WEB-INF/tiles/tiles-def.xml
Merge branch 'master' of github.com:krestine/randomSelectProject
asdf