Upload source code
Merge branch 'master' of https://github.com/lxthien/thienan
Merge branch 'master' of https://github.com/lxthien/thienan
11252014
Merge branch 'master' of https://github.com/lxthien/thienan

Conflicts:
	system/application/controllers/home.php
	system/application/libraries/MY_Controller.php
	system/application/views/front/includes/header.php
	system/application/views/front/main.php