Removed test commit message
Merge branch 'master' of https://github.com/Zhibin-Zhang/PosterManagementSystem.git
Merge branch 'master' of https://github.com/Zhibin-Zhang/PosterManagementSystem.git
Merge branch 'master' of https://github.com/Zhibin-Zhang/PosterManagementSystem.git
Breaking stuff
Merge branch 'master' of
https://github.com/Zhibin-Zhang/PosterManagementSystem.git

Conflicts:
	src/ordappengine/Mailer.java
	war/WEB-INF/classes/.gitignore