Merge origin/master

Conflicts:
	src/amazon/DBConnection.java
Merge origin/master