Merge pull request #34 from 51seven/development

Development to staging
Merge remote-tracking branch 'origin/development' into staging
Merge remote-tracking branch 'origin/development' into staging
Merge pull request #35 from 51seven/development

done for today
Merge branch 'staging' of https://github.com/51seven/Customer-Key-Chain into staging
Merge remote-tracking branch 'origin/development' into staging
Merge remote-tracking branch 'origin/development' into staging
tag fix #2
manual merge
fucking git
Merge pull request #37 from 51seven/staging

asdasdasd