Safety commit
Merge branch 'master' of http://github.com/harrison-t-lm/ddf-ui