getting FreeMarker views to work. DO NOT FORGET TO ADD THE VIEW BUNDLE AHHHHHHHHHHH
fix merge conflicts, added FreeMarker views