render_note fix
Merge branch 'master' into t7_image
set image as optional in forms.py
views.py, base.js modified for non-required image
Merge branch 't7_image'