validations added
fixed merge confilcts
model tweaks
bootstrap pull
things