added all the .jsp files
Resolved conflicts
WTF!?!?!