Merge branch 'feature/digital-comms' into release/20140828

Conflicts:
	Gemfile.lock
Merge branch 'ad_notice' into release/20140828