LUN-368-tests -- added test
LUN-368-tests - small changes
LUN-368-tests -- small change
LUN-368-tests -- updated setup.py to include mock
LUN-368-tests --- merged with master and fixed errors related with SITE_ID
LUN-368-tests - finished refactoring to make them run with setup.py
LUN-368-tests -- reverted due to some django 1.5 requirements issues
Merge remote-tracking branch 'origin/LUN-368-tests'