azaza
Merge branch 'master' of github.com:CodeTrials/codetrials

Conflicts:
	codetrials-web/src/main/java/org/codetrials/server/service/BundleLoader.java