Change-Id: Id35a23af1c5dfa97f6d98de8f35da85490008e59
Merge branch 'master' of https://github.com/DrinknLink/DrinknLink.git

Conflicts:
	DNL_yuchen/application/controllers/main.php

Change-Id: Ie41170cc15d9bb5dace1a9cb945768b9254fd85a