Merge pull request #177 from owncloud/master

Improve conference page
Merge pull request #183 from owncloud/master

Merge in countdown
Merge pull request #186 from owncloud/master

Add hashtag
Merge branch 'live' of github.com:owncloud/www into live
Merge pull request #191 from owncloud/master

Remove days from countdown
Merge pull request #192 from owncloud/master

Client Side OS Detection
update beta version
Update version numbers
Merge branch 'master' of github.com:owncloud/www
Merge branch 'live'

Conflicts:
	page-install.php
Update feature video
Update feature video
Disable release announcement button
Merge branch 'master' into oc7launch2

Conflicts:
	page-features.php