Merge branch 'develop' of https://github.com/tansaku/LocalSupport into js_reconfig
Merge pull request #187 from johnnymo87/js_reconfig

JS reconfiguration
Merge branch 'develop' of https://github.com/tansaku/LocalSupport into without_users
adding back in testing cookie accept as part of targeted email invite sequence plus formatting update
Merge branch 'without_users' of https://github.com/tansaku/LocalSupport into without_users
Merge branch 'without_users' into navbar_admin
Merge pull request #188 from johnnymo87/without_users

UI upgrade for organization_reports/without_users
checking for bootstrap toggle - failing at present
Add second jasmine spec for bootstrap toggle spec
Merge pull request #189 from johnnymo87/navbar_admin

Admin navbar
Use first method instead of zero indexing into an array to fix jasmine spec
Merge pull request #196 from mtc2013/jasmine_ci_fix_again

Use first method instead of zero indexing into an array to fix jasmine spec
merging to latest develop changes
refactoring older new org tests to match links new location -failing
Merge pull request #192 from cored/application-controller

Refactorings: Application controller
Finished refactoring specs for new org in footer
Merge pull request #193 from rbatta/develop

Slightly more idempotent seeds.rb file
Merge pull request #184 from mtc2013/new_org_in_footer

New org in footer
refactored view/js to search for send_invitation boolean
merging jon and rafael's pull request