Merge branch 'master' of /home/jason/IdeaProjects/ionic with conflicts.
added dynamic list to the "let's meet" view