Merge pull request #23 from loopandlearn/newloopdev

Profiles customization - Merge conflict handling with latest dev

Author: bjorkert