Heard you like case insensitive regex strings? '/(.*)/i' Conflicts:
Heard you like case insensitive regex strings? '/(.*)/i'
Conflicts:

	lib/SpotTemplateHelper.php

mesa57/spotweb,LeeThompson/spotweb,the-darkvoid/spotweb,Blauwbek/spotweb,riksmith/Spotweb,Blauwbek/spotweb,gijsroge/spotweb,rodikal/Spotweb,GeoffreyDijkstra/spotweb,mbirth/spotweb,the-darkvoid/spotweb,mbirth/spotweb,tswestendorp/spotweb,rodikal/Spotweb,isuftin/spotweb-1,GeoffreyDijkstra/spotweb,Spotweb/Spotweb,Spotweb/Spotweb,Blauwbek/spotweb,isuftin/spotweb-1,tswestendorp/spotweb,riksmith/Spotweb,LeeThompson/spotweb,gijsroge/spotweb,mesa57/spotweb