waste
Merge branch 'master' of https://github.com/team-LRP/shinedotcom

Conflicts:
	shinedotcom/src/main/AndroidManifest.xml
	shinedotcom/src/main/java/com/teamlrp/shinedot