Update version to dev.
	modified:   atmosphere/version.py
Allocation quota bugfix
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'stable' of https://github.com/iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	atmosphere/version.py
Resume/Suspend now release/reacquire IP addresses appropriately. RTWO REINSTALL REQUIRED
Fix ATMO-212 when there is no instances on the selected identity.
	modified:   resources/js/cf2/views/settings_screen/identity_summary.js
Add a max version to requirements.txt for libcloud.

This will allow for pip install --upgrade -r requirements.txt still.
We should start keeping track and evaluating libcloud 0.14.x so we
can port to it when it's stable (or at least closer to being stable).
	modified:   requirements.txt
Resume/Suspend feature complete for now.. Complete network removal has been deemed impossible at this time, notes in service/instance.py
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Suspend/Resume checkpoint 1
Checkpoint 2
Suspend/Resume checkpoint 2
Resume/Suspend on hold until the order of operations has been determined. Suspended/resumed instances will maintain their current networks and IP addresses until further notice.
Merge branch 'stable' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Additional point of failure found in CAS
Added virtualization type to provider fixture
Typo
Remove spammy logger statements from service.allocation.
	modified:   service/allocation.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	service/allocation.py
Change requirements to keep away from celery 3.1 for now.
	modified:   requirements.txt