Merge branch 'master' of https://github.com/chaninz/bandbrary

Conflicts:
 application/views/account/changePassword.php
 application/views/account/edit.php