Price and portfolio management. Site settings in database
sorl-thumbnails integrated for profile app
fix conflict
fix merge
Edit profile module