Merge branch 'develop'
Merge branch 'develop'
added disabled to value selectbox
whitespace
whitespace
consider first "change" to be init and treat separately
loginc correction