small modifications
commit gitignore merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	ShinyHeaven/src/uiframe/MDI.mxml
Merge remote-tracking branch 'origin/master'

Conflicts:
	ShinyHeaven/src/uiframe/MDI.mxml
_
Merge remote-tracking branch 'origin/master'

Conflicts:
	ShinyHeaven/src/parsley/config/Config.mxml
remove commented code