#19366 - Changing log caracters proportions so the log is smaller and better looking.
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
made a test particle system
first step toward resizing avatars
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming

Conflicts:
	interface/src/Head.cpp
added emitter
raised home position
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
cleanup
Merge remote-tracking branch 'upstream/master' into particles