Updated gradle version to 2.1 and android SDK to 21 - Lollipop

Also improved gitignore