prepare ubox auth
add heroku
add postgres
add fb sdk, change to use postgres db
done changing to new database
Merge branch 'master' into lopv2

Conflicts:
	DiamondTest/src/com/cnc/diamond/components/Menu.java