Updated Japanese Translation
Merge pull request #83 from WedyDQ10/patch-3

Updated Japanese Translation
Service code.  Prep for merge of chhapils changes
Merge branch 'develop' of https://github.com/rsteckler/unbounce-android into develop
Merge branch 'master' of https://github.com/chhapil/unbounce-android into chhapil-master

Conflicts:
	app/src/main/java/com/ryansteckler/nlpunbounce/adapters/AlarmsAdapter.java
	app/src/main/java/com/ryansteckler/nlpunbounce/adapters/WakelocksAdapter.java
	app/src/main/java/com/ryansteckler/nlpunbounce/models/UnbounceStatsCollection.java
Finished the service blocking UI.
moving lowest price to  to coincide with service blocking launch
Update strings.xml (POEditor.com)
Update strings.xml (POEditor.com)
Update strings.xml (POEditor.com)
Update strings.xml (POEditor.com)
Update strings.xml (POEditor.com)
Update strings.xml (POEditor.com)
Update strings.xml (POEditor.com)
Update strings.xml (POEditor.com)
Update strings.xml (POEditor.com)
Update strings.xml (POEditor.com)
Update strings.xml (POEditor.com)
Update strings.xml (POEditor.com)
Update strings.xml (POEditor.com)