Updated gradle file to be compatible with Android Studio version 0.8.4. Updated licenses.
Merged master.