Added Categories and AJAX
Resolved all merge conflicts updated most recent add features