modified framework setting
modified framework setting
Merge branch 'develop' of https://github.com/bikrone/AppTrack into develop

Conflicts:
	.idea/inspectionProfiles/Project_Default.xml
	.idea/workspace.xml