WIP
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/TeamAA/Beer_Journal/JournalController.java
WIP