header ui , api .....
Merge branch 'master' of https://github.com/instribution/instribution

Conflicts:
	IS/ISAppDelegate.m