Adding dev files (not to be pushed to production)
Merge remote-tracking branch 'upstream/master'