Update Rename filename
5:55 jul 2014 : update revisi
Merge branch 'dev'

Conflicts:
	.gitignore