globalized several variables
color pikcker for settings page
Merge branch 'master' of https://github.com/ShahafZada/DASP.git