Merge templating
organization contact pagination
organization contact pagination
Merge dev-master