Initial commit
Adding learningswitch folder adn fixing some merge conflicts

Change-Id: I67bcc6c5dcb5dad4965dbf42fade0906df47909d