Polish
Merge remote-tracking branch 'upstream/master'
Add features.html
Add intellectual
Add newsletter/mini/ios
Add one
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/partials/footer.dot.html
Merge pull request #9 from ivanzhaowy/master

Merge