Merge branch 'release/1.2.12' into develop
Update CHANGELOG.markdown
Adding json content type header to install

Hopefully fixes an install issue where the browser interprets the
validation step response badly.
Fixed device order return in model for search, get_by_user. Added 'sequence' to add func. Also fixed devices.js to send sequence.
Merge branch 'develop' of https://github.com/twilio/OpenVBX into develop
updated the email handling for resets & new users to pass along errors to the UI
fixed the bad variable reference
adding additional bits to the ignore
Merge branch 'feature/errorhandling' into develop
Merge pull request #226 from walker/develop

Fixes device edit, display, and save in regards to sequencing
put a function_exists check in place to protect installs using PHP < 5.3
resolves https://github.com/twilio/OpenVBX/issues/236
incrementing patch level to reflect bug fix;
Merge branch 'hotfix/json_last_error'
Merge branch 'hotfix/json_last_error' into develop
Merge branch 'master' of github.com:twilio/OpenVBX
Fix for timing not allowing open on Sundays.
Interesting off by one error, 'w' is Sun-Sat:0-6, 'N' is Mon-Sun:1-7.
Credit goes to tjlytle: https://github.com/tjlytle/OpenVBX/commit/e6b7d2156ad23339215661b85310270b893be051
Merge pull request #239 from twilio/develop

Sunday Fix
Update CHANGELOG.markdown

Correcting the current version number in the changelog
Merge branch 'master' of github.com:gegere/OpenVBX