commit 07-11-14
Merge branch 'master' of https://github.com/PHdeOliveira/tspostwiki

Conflicts:
	wp-content/themes/twentythirteen/js/angular/controllers.js