Merge branch 'GUI-1040' of eucaconsole:/eucalyptus/eucaconsole into develop
GUI-1148: Add "Cancel" link to each step of launch config wizard.  Allow "Cancel" link on launch instance wizard to return to instances page.  Fix "Cancel" link in launch config wizard to go to the launch configs page rather than the instances page.
GUI-1153: Set initial IP count to 1 in Allocate IP Addresses dialog on Elastic IP landing page.  Remove initial disabled button state and code that's no longer needed.
GUI-1154: Set custom policy name only when a policy statement is selected, and restore selected policy statements when switching back to custom policy tab after a canned policy is selected.
Merge branch 'develop' of eucaconsole:/eucalyptus/eucaconsole into develop
Merge branch 'develop' of eucaconsole:/eucalyptus/eucaconsole into develop
Upgrade to Angular 1.2.20
Remove $location service on the volume detail page, which was left-out from the previous adjustment
Merge branch 'develop' into GUI-1148

Conflicts:
	eucaconsole/static/js/pages/instance_launch.js
	eucaconsole/static/js/pages/launchconfig_wizard.js
Merge branch 'develop' into GUI-1153

Conflicts:
	eucaconsole/static/js/pages/ipaddresses.js
Upgrade to Angular 1.2.21
Merge pull request #845 from eucalyptus/GUI-1165

Gui 1165 AngularJS Upgrade
Merge pull request #840 from eucalyptus/GUI-1153

GUI-1153: Set initial IP count to 1 in Allocate IP Addresses dialog on Elastic IP landing page
Merge pull request #841 from eucalyptus/GUI-1154

GUI-1154: Set custom policy name only when a policy statement is selected...
Merge pull request #838 from eucalyptus/GUI-1148

GUI-1148: Fix broken/missing Cancel links on launch config and launch instance wizards
merged develop
removed pdb