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

Conflicts:
	DNL_yuchen/application/controllers/main.php
	DNL_yuchen/application/views/login.php

Change-Id: Idd4924a7b4e79bfe88912cf7abbd406381b83f62