functions parallel edit stash
Merge branch 'develop' of https://github.com/urbanlink/columby into develop

Conflicts:
	background/functions.php
Merge branch 'develop' of https://github.com/urbanlink/columby into develop
datatablejs temp fix