Merging
Merge branch 'master' of https://github.com/neafie/2MAC.git

Conflicts:
	MLA/src/library/CreateAttemptFunctions.java
Hard coded layout for community achievement details page.
Merge branch 'master' of https://github.com/neafie/2MAC.git
Fix syntax errors.