checkpoint 1

added some lines
final commit
Merge pull request #1 from FamedenDev/master

Make the master and 2014demorelease branch in sync