added end turn functionality
Merge branch 'F_End_turn' into dev