bootstarpers editted, some bug fixed
note editting works now!
Merge branch 'develop'

Conflicts:
	iMVC