merging develop branch into ft-sideNav branch