add async to javascript
update htaccess for cache file
commit for merge
Merge branch 'master' of https://github.com/huskycode/thsea

Conflicts:
	public/protected/config/db.php