edits

editsssss
Merge remote-tracking branch 'origin/neil_9132014_0' into ian-9-10-14

Conflicts:
	Styles/theme.css
some edits please check
today some changes

chechechanges
added images edits
Merge remote-tracking branch 'origin/neil_9162014_0' into ian-9-10-14
Merge branch 'ian-9-10-14' into neil_9162014_0