Change-Id: Id87e88542984f10e658c200dcbfe6945a6c86ab6
Merge branch 'master' of https://github.com/DrinknLink/DrinknLink.git

Conflicts:
	JavaApplication4/src/javaapplication4/JavaApplication4.java

Change-Id: I2613a40f133b8d514f26939939785c22268c6810