loggg
Merge branch 'master' into laura

Conflicts:
	log/development.log
ajax picture uploads yay
got rid of some end tags
Merge branch 'laura'