changed some layout and javascript
changed some layout and javascript
Merge origin/master

Conflicts:
	ViewArticle.php