First commit moviebuddies. Only UI.
Merge origin/master