contest and submission

Change-Id: I8bf73fd1fffa8c107c17fc2b3c4030f8b12dec9e
refactor
Merge branch 'develop' into staging
Merge branch 'staging'