Add PUT method
Merge branch 'develop'

Conflicts:
	test/DatabaseManager.java