Merge branch 'master' of http://git.khansia.co.id/indra/queue into master

# Conflicts:
#	public/action-js/antrian-js/action-kelolapoli.js