nam add
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/uploads/2013/05/16-150x150.jpg
	wp-content/uploads/2013/05/16-300x300.jpg
	wp-content/uploads/2013/05/16-90x90.jpg
	wp-content/uploads/2013/05/16.jpg
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/uploads/2013/05/16-150x150.jpg
	wp-content/uploads/2013/05/16-300x300.jpg
	wp-content/uploads/2013/05/16-90x90.jpg
	wp-content/uploads/2013/05/16.jpg