Merge branch 'origin/master'
Build version
NPE
Added auto refresh
auto refresh
Merge branch 'origin/dev'

Conflicts:
	build.xml