commit21
Merge branch 'master' of https://github.com/daxo4/YBC

Conflicts:
	application/.htaccess
Merge branch 'master' of https://github.com/daxo4/YBC
Merge branch 'master' of https://github.com/daxo4/YBC
commit22