Switched to Live DB
Merge branch 'master' of https://github.com/SeoRoman/Tasks

Conflicts:
	app/config/database.php