Merge branch 'develop'
Merge branch 'develop'
refactor alloc init to new
Merge branch 'develop'

Conflicts:
	Classes/CrashReportSender.m
Merge branch 'develop' : ver 5.5.2
Merge branch 'develop' : ver 6.0.0
Merge branch 'refs/heads/develop'
Merge branch 'master' into develop

Conflicts:
	Classes/WebServerBackup.m
	Classes/controllers/AssetVC.m
	Classes/controllers/BackupVC.m
	Classes/controllers/CalcVC.m
	Classes/controllers/ExportVC.m
	Classes/controllers/ReportVC.m
	Classes/models/Asset.m
	Classes/models/CatReport.m
	Classes/models/DataModel.m
	Classes/models/Report.m
bug fix