Updated to lollipop
Merge pull request #13 from Connexions/lollipop

Updated to lollipop