Merge origin/master

Conflicts:
	src/main/java/org/mtop/security/InitializeDatabase.java