--
--
Merge branch 'master' of https://github.com/tqtuyen/SwordBI

Conflicts:
	Code/HTLBIWebApp2012/HTLBIWebApp2012/Index.aspx