Merge branch 'master' of https://github.com/kelleyaj/StealTheGlass.git

Conflicts:
	StealTheGlass-Prototype/src/main/java/stg/prototype/fb/FacebookDAO.java
Merge branch 'master' of https://github.com/kelleyaj/StealTheGlass