some more changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/mobile/tool/stock/manager/report/Templates.java