Animate new message in from bottom
Merge branch 'develop' of https://github.com/martinemil/Context-Aware-Mobile-Messaging into develop
Updated config-file to be more like the standard PhoneGap-config
Merge branch 'develop' of https://github.com/martinemil/Context-Aware-Mobile-Messaging into develop

# By Martin Andersen
# Via Martin Andersen
* 'develop' of https://github.com/martinemil/Context-Aware-Mobile-Messaging:
  Animate new message in from bottom
Updated path for image folder from "images" to "img"
New name for css-folder from "stylesheets" to "css"
New css dictionary + ruby configuration file
Merge branch 'develop' of https://github.com/martinemil/Context-Aware-Mobile-Messaging into develop

Conflicts:
	css/main.css
	message_standard.html
Git ignore .sass-cache folder
Fewer messages displayed
Send message (JS) added to proto-1
Prototype 2 initialised (new html, new scss + include in main.scss)
proto-2-scss file renamed
Updated javascript fired by send button
Merge branch 'develop' of https://github.com/martinemil/Context-Aware-Mobile-Messaging into develop

# By Martin Andersen
# Via Martin Andersen
* 'develop' of https://github.com/martinemil/Context-Aware-Mobile-Messaging:
  proto-2-scss file renamed
  Prototype 2 initialised (new html, new scss + include in main.scss)
  Send message (JS) added to proto-1
  Fewer messages displayed
Deleted favicon
Minor thing
Prototype 2 - Microphone and prewritten text added as additional inputs.
Merge branch 'develop' of https://github.com/martinemil/Context-Aware-Mobile-Messaging into develop
Updated padding on new input methods (proto-2)