look and feel change
Merge branch 'master' of github.com:littleboy85/jwa

Conflicts:
	jwa/templates/picture_form.html