Merge branch 'master' of https://github.com/jaggs6/dskyas

Conflicts:
	SKYAS/web/WEB-INF/web.xml
Conflict on checkout, not sure