re-creation of angular app
merge of conflicts