Switched the #main id to the angular layout
Merge branch 'develop' of https://github.com/damacisaac/bounty into develop