work done 10/10/13
Merge pull request #156 from dekpient/master

Fix various little problems
Fix for #132, #135
Merge remote-tracking branch 'upstream/master'
Merge pull request #157 from LisaHelm/master

Fix #145, add #132, #135
Fix small media edit page layout issues