Merge branch 'master' into anna
Merge branch 'master' into anna
Merge branch 'master' into anna
Merge branch 'master' into anna
Merge branch 'master' into anna
Merge branch 'master' into anna
add a descriptive title to delete instance view 

Signed-off-by: Tyler Baker <tyler.baker@linaro.org>
Merge pull request #210 from EmbeddedAndroid/master

add a descriptive title to delete instance view
Merge branch 'develop'

Conflicts:
	templates/instance.html
Conflict fix
Merge branch 'master' into anna
Fix #211
Merge branch 'anna'
Move to nginx
Fix template
Deprecated simplejson
Fix edit buttons
Add descriptions in template view
better error handling when locating storage devices

Signed-off-by: Tyler Baker <tyler.baker@linaro.org>
Remove onclick