Merge pull request #368 from AppScale/testing

Merging 1.6.8 into master
Merge pull request #417 from AppScale/testing

bumped version number to 1.6.9
Merge pull request #431 from AppScale/testing

Fixes broken build script for numpy/matplotlib
Merge remote-tracking branch 'brian/fix-app-upload-errors2'
Merge remote-tracking branch 'org/testing'
bumping version number
Merge pull request #502 from AppScale/ui

changed status icons and logo placement
Merge pull request #503 from shatterednirvana/release-1.7.0

Release 1.7.0
App upload fixed
Merge pull request #504 from briandrawert/fix-app-upload-errors2

App upload fixed
Merge branch 'testing' of https://github.com/AppScale/appscale into ui
fix for channel API for java
Merge pull request #505 from nlake44/javachannel

fix for channel API for java
Merge pull request #508 from AppScale/testing

AppScale 1.7.0 Release
Merge branch 'master' of https://github.com/AppScale/appscale into ui
removed icon font and replaced with png images, also removed nav and status headings