!= null also covers undefined case
clear the changes
Merge branch 'develop' of https://github.com/ImaginationForPeople/assembl into class_refactoring