Add subscription_test.cpp back to Makefile (and fix some indetations)
Merge pull request #388 from Metaswitch/fix_makefile

Add subscription_test.cpp back to Makefile (and fix some indetations)
Fix merge conflict