Merge branch 'release/1.5' into develop
bump version to 1.6-SNAPSHOT
Merge branch 'hotfix/1.5.1' into develop

Conflicts:
	client/pom.xml
	pom.xml
	server/application.properties
	server/pom.xml
LIBITD-269. add McKeldin 3rd floor to location list.

https://issues.umd.edu/browse/LIBITD-269
Adding windows client scripts to version control
Adding mac client launcher scripts to version control
LIBITD-268. Logout not captured from Mac computers running 10.9

Modified launcher scripts to set USER env var if it doesn't exist.

https://issues.umd.edu/browse/LIBITD-268
bumped version to 1.6
Merge branch 'release/1.6'