josh
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/Model/InstanceHelper.java
	src/main/Model/Login.java
3rdpanelpartial
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	src/main/Controller/AddKeyServlet.java
	src/main/Model/Instance.java
	src/main/webapp/view/js/2ndpanelAjaxCalls.js
3rdpanelpartial