Set the compile target to 1.6

The production server only has java 1.6
Merge branch 'hot_fix'