merge upstream
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
pages_controller_spec all working again
Merge pull request #19 from tihuan/fix/pages_controller_spec

Fix/pages controller spec
Database Cleaner Working
Merge pull request #20 from tihuan/chore/database_cleaner_config

Database Cleaner Working
Add user show page, concert show page
- User can add concert to attended concerts via ajax
- Song videos added via ajax
- fixed various bugs
- removed turbolinks - it was causing add song jquery not to fire
- these features need tests
Merge pull request #21 from Onaracs/feature/users_page_show_attended_concerts

Add user show page, concert show page