Changed bill top buttons
Merge commit 'pull/origin/22'

Conflicts:
	www/assets/scripts/index.js