added together.jolla.com
Merge branch 'master' of https://github.com/hardcodes/developwithsailfishos

Conflicts:
	latex/Developing-with-SailfishOS.pdf