Added modifications and integrated branched one with master
Added Save/Open Project in Alpha mode
fixed some formatting bugs