Documentation improvements
Added missing expires
Merge branch 'bootstrap3' of https://github.com/bp323/3akai-ux into bootstrap3
Synchronized Nginx config file
Merge branch 'bootstrap3' of https://github.com/bp323/3akai-ux into bootstrap3
Merge branch 'bootstrap3' of https://github.com/bp323/3akai-ux into bootstrap3
Documentation follow-up
Code ordering
Merge branch 'master' into bootstrap3

Conflicts:
	shared/oae/css/oae.skin.less
	ui/bundles/hi_IN.properties
Merge branch 'bootstrap3' of https://github.com/oaeproject/3akai-ux into bootstrap3

Conflicts:
	shared/oae/css/oae.components.css