Minimal Working Sytem Commit. Added model and controller packages to
ARNA project folder as a temporary fix to build path errors
Merge remote-tracking branch 'origin/master'

Conflicts:
	Model/src/edu/ycp/cs481/arna/shared/model/LocationTest.java