null exception in add view
brand edit with normal keyboard
disable dirty field
in add view, only allow to add image if category and style are selected
merged
Merge remote-tracking branch 'origin/master'