Fixed some small bugs and layout issues
Fixed Social Link Issues
Added index changes.
Added post short codes to pages
Cleaned up spelling in the short codes windows
Slight clean up before official release.

Fixed some issues, added some new short codes, added new documentation.
did nothing
uncommitted changes

uncommited changes
All I did was take 1.2 and replace it in here. Not the best merging technique
Fixed conflicts