Merge branch 'release/1.2.6'
Merge branch 'release/1.2.7'
Merge branch 'release/1.2.8'
Reverting previous change for query string parsing

Reverts a previous change which was made to accommodate custom
query string args in applets. It unfortunately conflicts with
the way mod-rewrite is done on some systems.
Merge branch 'release/1.2.9'
Merge branch 'release/1.2.10'

Conflicts:
	OpenVBX/libraries/OpenVBX.php
Merge branch 'release/1.2.11'
Merge branch 'release/1.2.12'
Merge branch 'master' of github.com:twilio/OpenVBX
Update CHANGELOG.markdown
Update CHANGELOG.markdown
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