Team development
Merge branch 'master' of https://github.com/yecpster/igearbook.git

Conflicts:
	src/com/igearbook/action/TeamAction.java
	webapp/WEB-INF/config/database/mysql/mysql.properties
	webapp/templates/default/team/team_show.ftl

Change-Id: Id595170bb399da9c857c5e0791da79d07996b201