Account - finishing
Merge branch 'template' of https://github.com/sidewinder94/booXstore into template