add c
Merge branch 'production'
Merge tag 'release/staging/2014-05-15.1' into production

2014-05-15 staging release
Cut from master

Generation 2
Merge tag 'release/staging/2014-05-15.2' into production

2014-05-15 staging release
Cut from master

Generation 3
wow
Merge branch 'JIRA-INF-2' into production