more front end code done
Merge branch 'master' of git@github.com:opencart/opencart.git