Merge branch 'develop' of https://github.com/mikekucharski/inkd into develop
moved account settings page to MVC
fixed about a 100 merge conflicts
Updated ajax url for profile settings
Pulled account settings page changes from Dhruv