fixed variable name typo
updated constants for spring 2014, also added some comments explaining naming scheme
Merge branch 'release/spring_2014' into develop