UPGRADING: Angular1.2.2 + additionals && fixing modals (WIP)