Completing feature f
Merge branch 'feature_f' into development
Completing feature e
Adding test script
Merge branch 'test_script' into development
new app and files
Merge branch 'feature_1' into development
fixing conflict
Merge remote-tracking branch 'origin/feature_e' into development
fix
fix
Merge remote-tracking branch 'origin/feature_e' into release
conflict fix
Merge remote-tracking branch 'origin/release'