Merge branch 'dev'
adding badges
upgrading to laravel 5.0. need to test still
testing with laravel 5
fixing tests