java
Merge branch 'master' of https://github.com/alsosun/dlsmobile

Conflicts:
	assets/js/loadxmlout.js
	saskcur.html

don't know