merge lastest changes

This commit is contained in:
Spencer Alger
2014-03-27 13:40:01 -07:00
22 changed files with 671 additions and 443 deletions

File diff suppressed because it is too large Load Diff