Updated to angular 1.2, added jquery, updated journal for compatibility