add apps at front end
Merge remote-tracking branch 'origin/blog' into blog
Merge remote-tracking branch 'origin/blog' into blog

Conflicts:
	blog/wp-admin/app.php
	blog/wp-admin/fix/jsApps.php
	protected/controllers/SiteController.php
	protected/models/Apps.php
	protected/views/site/index.php
swipe js tool