Add People search by phone number & email
Merge branch 'develop'

Conflicts:
	Rock.Rest/Controllers/PeopleController.Partial.cs
Update search with latest code from develop
- More workflow updates
- fixed invalid liquid in AdList block [Fixes #465]. Also changed AdDetails block to reference an external liquid file to make it consistant.
- changed order of fields on checkingrouptypeeditor block
- update populate_metrics to include more attendance data and some metrics for a pie chart
- fix unneeded string.format in FileBrowserController
- fix chart combinevalues logic to include the adjusted chartdata
- added combinevalues logic to piechart
- fix up tooltips to work in piechart and position a little better
- fix piechart to not show legend by default
- Update workflow entry screen to use bootstrap button instead of linkbutton
- Remove tabstop from help icon
- Update AsInteger() method to return zero when empty correctly.
- Fix empty string as zero for AsDecimal() and AsDouble() also.
- Add IconCssClass property to WorkflowType model
- Add migration roll ups
Merge branch 'develop'
- split the int? AsInteger( bool emptyStringAsZero = true) string extension into int AsInteger() and int? AsIntegerOrNull().  This eliminates the confusion of when AsInteger will return 0 or null
- split the double? AsDouble( bool emptyStringAsZero = true) string extension into double AsDouble() and double? AsDoubleOrNull().  This eliminates the confusion of when AsDouble will return 0 or null
- split the decimal? AsDecimal( bool emptyStringAsZero = true) string extension into decimal AsDecimal() and decimal? AsDecimalOrNull().  This eliminates the confusion of when AsDecimal will return 0 or null
- fix for missing credit card icons
Update GetByEmail and GetByPhoneNumber with feedback from @azturner