Changes!
Merge branch 'master' of https://github.com/melchi17/teammaker

Conflicts:
	src/com/team/maker/servlet/TeamServlet.java
	war/WEB-INF/appengine-generated/local_db.bin