Merging
Merging
merging
merging
Merge branch 'master' of
https://github.com/ipeirotis/mturk-tracker-gae.git

Conflicts:
	src/main/java/com/tracker/util/SafeCurrencyFormat.java
	src/main/java/com/tracker/util/SafeDateFormat.java
	src/main/webapp/WEB-INF/queue.xml