Correct spelling mistake in 'generic_error'
Merge pull request #10 from janedallaway/patch-1

Correct spelling mistake in 'generic_error'
Use http_build_query to generate query string
Fixed Datatable Search
Added Secondary Contact

* Add secondary contact to a person
* Moved data table method to Person controller so that it can be reused
* closed #4
Semantic Grid

Removed the grid from the HTML and placed it into the SCSS as Foundation Mixins.
Merge branch 'master' of github.com:ushahidi/pingapp into semantic-grid

Conflicts:
	application/views/pages/login.php
	application/views/pages/person/edit.php
Merge pull request #13 from ushahidi/semantic-grid

Semantic Grid, with fixed merge conflicts
Merge pull request #12 from ushahidi/secondary-contact

Secondary contact
Minor fix
Merge branch 'master' into sms-message-dev

Conflicts:
	application/views/pages/dashboard.php
SMS Provider sanity checks

* If there's an error in the SMS configuration file, unset
PingApp::$sms_provider

* Throw PingApp_Exception if an error is encountered when
instantiating the configured SMS provider