Merge branch 'master' of /Users/rbm/Sites/exaprint/api-etiquettes with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.php
Merge remote-tracking branch 'origin/master'