Merge branch 'devel'
Updated colour scheme

less gray
merge problem related to emailTemplates
tweaked appSignin layout and signin function from menubar