Merge branch 'master' into development
put proper colors on input fields
Merge branch 'development'