Include angular.js
Bower directory
Angular index
Angular test
Update Home page
Edit js
Loading Bar
Update File
Edit File
Update file
Delete yaml file
Pinyin
Update Pinyin
Query Filter, Helper Test
Update Sortable.php
Fix
Modified System Model
Merge branch 'feature/ng' into develop

Conflicts:
	modules/system/Classes/ExceptionBase.php
	modules/system/Database/Attach/Resizer.php
	modules/system/Database/Dongle.php
	modules/system/Database/Relations/BelongsToMany.php
	modules/system/Database/Traits/Filterable.php
Delete file
Merge branch 'develop' of https://github.com/sysatom/ComicSearch into develop

Conflicts:
	app/tests/HelperTest.php
	modules/backend/Behaviors/FormController.php
	modules/backend/Behaviors/ListController.php
	modules/backend/Behaviors/RelationController.php
	modules/backend/Behaviors/UserPreferencesModel.php
	modules/backend/Macro/HtmlMacro.php
	modules/frontend/Classes/CombineAssets.php
	modules/frontend/Classes/FileHelper.php
	modules/frontend/Classes/FrontendException.php
	modules/frontend/controllers/HomeController.php
	modules/system/Classes/ExceptionBase.php
	modules/system/Classes/UpdateManager.php
	modules/system/Classes/VersionManager.php
	modules/system/Database/Attach/Resizer.php
	modules/system/Database/Dongle.php
	modules/system/Database/Relations/BelongsToMany.php
	modules/system/Database/Traits/Filterable.php
	modules/system/Database/Traits/SimpleTree.php
	modules/system/Models/EventLog.php
	modules/system/Models/RequestLog.php
	modules/system/Repositories/AbstractRepository.php
	modules/system/Repositories/Common/BaseRepositoryTrait.php
	modules/system/Support/helpers.php
	modules/system/macros.php