Merge branch 'development' into ava
get rid of annoying green navigation bar...
Merge branch 'ava' into development