* change test on app in main.js. Preparing mergin. Brace yourselves.
Merge branch 'develop' of github.com:SaltySoft/happy_hours into develop
* merging connection string with jackso_a in app.config and web.config.
Merge branch 'develop' of github.com:SaltySoft/happy_hours into develop