sss
sssss
Merge branch 'master' of https://github.com/ernstpi/thestick.git

Conflicts:
	application/config/config.php