Whale
Merge branch 'master' of https://github.com/maalaang/Sunrise

Conflicts:
	settings/config.php
	views/main/signin.php