Merge branch 'hotfix/zombie-threads-fix'
Merge branch 'hotfix/zombie-threads-fix'
Merge branch 'release/1.1'
links added for api advert and custom advert
added api CTA, github link and Hire Us mention
Merge branch 'release/1.1.1' of https://github.com/fluxtream/fluxtream-app into release/1.1.1
Fluxtream v1.1.1, FTW!
Merge branch 'development' of github.com:fluxtream/fluxtream-app into development
Fixed small issue that wouldn't remove underscores for connectors with multiple underscores in their names
Merge branch 'development' of https://github.com/fluxtream/fluxtream-app into development
Made yaxis width 48px so up to 999,999 will display appropriately
Merge branch 'development' into release/1.1.1

Conflicts:
	fluxtream-web/src/main/webapp/WEB-INF/jsp/index_branded.jsp
added production schema to release
Merge branch 'release/1.1.1'
Merge tag '1.1.1' into development

1.1.1
Merge branch 'development' of https://github.com/fluxtream/fluxtream-app into feature/sleep-as-android-integration
Set default channels for sleep as android