fix clobbering of images
fix clobbering of images
add version number to spartan image to prevent caching
Merge branch 'master' into bootstrap3

Conflicts:
	application/views/_partials/h4/profile/block_photo.php