Modefied models to include filters.
Made changes to the views.py file to handle /album url calls
Solving merge conflicts.
Made changes to the models structure. Added a new app that handles all the User models and user realted views and corresponding urls. Also updated some of the url.py files for imagr_images. Moved the view relating to front page to imagr_sites.viewsalong with the corresponding urls.py
Installed South. Migrated db to south.
Made changes to the structure of the application.