@@
Merge branch 'images-db' of github.com:veljamatic/bicwp into images-db
upload images
steps template
shapes admin
images and shapes stuff
front end images and shapes
finished uploading images and shapes
merging commit
db update
minor fixes