Merge branch 'release/20130312'
Removing .idea workspace from git
Merge branch 'release/20130312-2'
Merge branch 'release/R20130507'
Adding new models to the app.
Merge branch 'release/R20130521'

Conflicts:
	backend/models.py
Merge pull request #1 from iceraj/master

Improved Accessibility
Merge branch 'release/V20130603'
Merge branch 'master' of starapp.mit.edu:StarCellBio
Merge branch 'master' of github.com:starteam/StarCellBio
Merge branches 'master' and 'master' of ceraj@starapp.mit.edu:StarCellBio
XML of assignments for load testing
Merge pull request #4 from starteam/develop

Develop 2 Master