Revert 851b988..c708ed8

This rolls back to commit 851b9887331922a3e74f08028c089db69fed34ae.
updated to jdk7 and added in proper gae library