little refactoring
fix conflicts import_legacy
config db settings
deployment configs
fix wrong index
deployment fixes
Merge branch 'capistrano_from_scratch'
fix a mistake
add file
dos2unix ssh
testing change
security fixes
fix title image
revert security in photos_controller
Merge branch 'master' of github.com:ozelen/dj-engine
merge after fail
merge after recover, import fixes