app-nordis-20141013-02

merge