add feature_1
add feature_2 by dude
Merge branch 'feature/xude_feature_2' into develop

Conflicts:
	src/GitCreator.as
Merge branch 'release/release20130917'