rizqi

resolve conflict
rizqi

resolve conflict
rizqi

resolve conflict
rizqi

resolve conflict
Merge branch 'master' of https://github.com/aiqie/Permata

Conflicts:
	AssetManagementPermata.suo
	AssetManagementPermata/bin/Debug/AssetManagementPermata.pdb

	AssetManagementPermata/obj/x86/Debug/AssetManagementPermata.csproj.GenerateResource.Cache
	AssetManagementPermata/obj/x86/Debug/AssetManagementPermata.exe
	AssetManagementPermata/obj/x86/Debug/AssetManagementPermata.pdb

	AssetManagementPermata/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache