Gallery fix & remove https from cnk
Merge branch 'feature/Phase2' of https://github.com/pixces/cnksite into feature/Phase2

Conflicts:
	protected/config/init.php